ffmpeg: update to 3.2.6, correct arm optimization check

mpfu=neon implies neon-vfpv3, so enable vfp when just neon is found.

Signed-off-by: Ian Leonard <[email protected]>

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 8f9e9c2bf5fa794abdf0e2c4dfcd61df62b9d962..aa7d9748e4efe8e45d2b7601b21ee1b43484db96 100644 (file)
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
-PKG_VERSION:=3.2.5
+PKG_VERSION:=3.2.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ffmpeg.org/releases/
-PKG_MD5SUM:=b53ecfcbafca973f92bfb77815cce01e
-PKG_HASH:=0c0c15e999c66003b969c7a5d61c4a7e1d3dfbf3c809c23ff5537d583dd93323
+PKG_MD5SUM:=7a35bd97bd7253305bf5c0af5f9dd3ce
+PKG_HASH:=3751cebb5c71a861288267769114d12b966a7703a686a325d90a93707f3a6d9f
 PKG_MAINTAINER:=Ted Hess <[email protected]>, \
                Ian Leonard <[email protected]>
 
@@ -431,11 +431,18 @@ endif
 
 # selectively disable optimizations according to arch/cpu type
 ifneq ($(findstring arm,$(CONFIG_ARCH)),)
-       ifeq (,$(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)))
+       ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),)
+               FFMPEG_CONFIGURE+= \
+                       --enable-vfp
+       else
                FFMPEG_CONFIGURE+= \
                        --disable-vfp
        endif
-       ifeq (,$(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)))
+       ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
+               FFMPEG_CONFIGURE+= \
+                       --enable-neon \
+                       --enable-vfp
+       else
                FFMPEG_CONFIGURE+= \
                        --disable-neon
        endif